Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: [DHIS2-18746][DHIS2-18903] Show org. unit in edit event form #3949

Merged
merged 16 commits into from
Feb 24, 2025
Merged

feat: [DHIS2-18746][DHIS2-18903] Show org. unit in edit event form #3949

merged 16 commits into from
Feb 24, 2025

Conversation

henrikmv
Copy link
Contributor

@henrikmv henrikmv commented Jan 26, 2025 •
edited by jira bot
Loading

DHIS2-18746 and DHIS2-18903:

  • The Org Unit selector in the top bar is blocked on the Edit event page.
  • A OrgUnit object (containing id, name, and path) has been added to the Redux keys:
    • enrollmentEvent-viewEvent
    • enrollmentEvent-editEvent
      As a result, the OrgUnitId field added to enrollmentEvent-viewEvent in DHIS2-16337 has been removed.
  • The OrgUnit object is now included in the Server API request data.
  • The Rules Engine has been updated with similar logic to what was implemented in DHIS2-18325.

@henrikmv henrikmv marked this pull request as ready for review February 14, 2025 14:04
@henrikmv henrikmv requested a review from a team as a code owner February 14, 2025 14:04
@github-actions GitHub Actions
Copy link

github-actions bot commented Feb 15, 2025 •
edited
Loading

🚀 Deployed on https://deploy-preview-3949.capture.netlify.dhis2.org

@henrikmv henrikmv marked this pull request as draft February 17, 2025 09:24
@henrikmv henrikmv changed the title feat: [DHIS2-18746] Show org. unit in edit event form in Tracker program feat: [DHIS2-18746] Show org. unit in edit event form Feb 17, 2025
@henrikmv henrikmv marked this pull request as ready for review February 17, 2025 16:12
@henrikmv henrikmv changed the title feat: [DHIS2-18746] Show org. unit in edit event form feat: [DHIS2-18746][DHIS2-18903] Show org. unit in edit event form Feb 17, 2025
@henrikmv henrikmv marked this pull request as draft February 20, 2025 11:12
@henrikmv henrikmv added e2e record Apply this label to a pull request to trigger recording of E2E tests on Cypress Cloud testing labels Feb 20, 2025
@henrikmv henrikmv marked this pull request as ready for review February 20, 2025 11:34
@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
27.4% Duplication on New Code

See analysis details on SonarQube Cloud

@henrikmv henrikmv added e2e-tests and removed preview testing e2e record Apply this label to a pull request to trigger recording of E2E tests on Cypress Cloud labels Feb 21, 2025
@henrikmv
Copy link
Contributor Author

@simonadomnisoru:
@JoakimSM advised me not to add path to the rules engine type for org. unit. In addition, he noticed that the map for adding geometry was not sent the correct org. unit. This should now be fixed. Would you like to take a look? Thanks!

geethaalwan
geethaalwan approved these changes Feb 24, 2025
View reviewed changes
Copy link

@geethaalwan geethaalwan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested successfully on 2.42,2.41.4,2.40.8,2.39.10 versions

@henrikmv henrikmv merged commit 3d0e394 into master Feb 24, 2025
40 of 42 checks passed
@henrikmv henrikmv deleted the hv/feat/DHIS2-18746_ShowOrgUnitInEditEventFormTrackerProgram branch February 24, 2025 20:49
dhis2-bot added a commit that referenced this pull request Feb 24, 2025
@dhis2-bot
chore(release): cut 101.28.0 [skip release]
ec982e3 
# [101.28.0](v101.27.4...v101.28.0) (2025-02-24)

### Features

* [DHIS2-18746][DHIS2-18903] Show org. unit in edit event form ([#3949](#3949)) ([3d0e394](3d0e394))
@dhis2-bot
Copy link
Contributor

🎉 This PR is included in version 101.28.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@simonadomnisoru simonadomnisoru simonadomnisoru approved these changes

@geethaalwan geethaalwan geethaalwan approved these changes

Assignees
No one assigned
Labels
e2e-tests released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@henrikmv @dhis2-bot @simonadomnisoru @geethaalwan @karolinelien